Robustify merge-gnulib a bit

* admin/merge-gnulib: Fail if autogen.sh fails.
Remove autom4te.cache before running gnulib-tool.

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 4aabffa0dcd204fbf325cc9bb21d42f026b77038..fec469c017915ef4f67ac214e07a2e4d91687ec0 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -103,7 +103,10 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
 }
 
 # gnulib-tool has problems with a bare checkout (Bug#32452#65).
-test -f configure || ./autogen.sh
+test -f configure || ./autogen.sh || exit
+
+# Old caches can confuse autoconf when some Gnulib-related changes take effect.
+rm -fr autom4te.cache || exit
 
 avoided_flags=
 for module in $AVOIDED_MODULES; do